Project

Cleanup and project module support