Move system controllers under Module\System. Move User under Module\User. Move templates under Module scopes.