reverting the reorganization done in 3455-3456 in order to make merging my experimental branch to trunk easier.

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