Dominic: renaming and moving classes and objects