Tidy up the final code

These changes are after the final assessed demo and just tidy up the
folder structure in preperation for open-sourcing

Signed-off-by: Alistair Francis <alistair@alistair23.me>