Restructure for better Composer compatibility