Fix Directory Structure for Autoloading