Changing structure and naming convention for better autoloading