Project cleanup and redesign