More organization, fixed Multiverse loading error