Reorganizing project folder a bit