Tweak file layout in project