reorganized structure of repo a tiny bit