Class variables now at bottom of classes

Will need to just check the Accessor methods are int he right order -
but will do this later.

Changed all public variables to private - no compile errors, however
will need to make use of accessor methods