Cleaning the repo, and organizing it more carfully