Cleaning up and moving separate parts into their own branches