Restructured projects and added CPSC to work list