Restruct directory hierarchy
Updates to make the whole repo build.