Reorganized and enhanced

Can make use of RegistryBundle now