Preparation for new organization of code in to sub packages. Changed autoload() to work with new structure.
