Changed structure of files to make Autoloading work