Autoloader file structure improvement

Fix for issue #65