Cleaning up moving around and renaming
concluding merge