Refactor project structure. Organized settings a bit.