More project files, some clean up of Primitive types and ForLoopNested