Restructed layout of repo