Fix folder structure for autoloading