Project reorganization

Reorganized the project structure and settings for non-MAMP environments.