Moving around
Do a bit more renaming
More refactoring integration