Files untidy

[trumpton]

There are a lot of includes that are ../../etc.
This is untidy.
Changes such as accessing variables in lower-level functions and storing them is preferable to passing the Project down to the lower-level.