Reorganized project structure and allowed for easy building.