Restructure repo review