refactoring of repo structure to make everything more intuitively located