Reorganizing project folder to make better sense of stuff