Further organisation

Further organised into modules, some other refactoring and renaming.
Added a slight pause before the first update to the initial level.