Project file overhaul

Not yet perfect, but on the way