restructure of repo, such that everything is in the top level dir.