reorganized cup proj
reorganized again