moved new experimental definitions from ControllerBuildingMacroExperimental to ControllerBuildingMacroExperimentalEnvironment;
removed extension of old counterparts for some experimental macros;