Seems to be working now, after adding .project.
Changed location of various files into packages for easier editing.
May have to change access of various variables to compensate at a later date.