Reorganize structure of repo