Post-final

Tidying up code.
Post-final

Cleaned up file structure