Class organisation and updates

15th July 2018