Reorganized the repo in a preparation for a merge with the main repo