Cleanup and restructuring project files