Important code refractoring, movement and renaming