move repo into a more organized structure, a few renames