Reorganized structure of repo