Rework of repo structure