Move files for path resolution and autoloading.
Add files back in for autoload path.