Cleaning up the layout of the repo