Project cleanup
Merge project files