Tidied up project layout, less clutter in IDE now