Tidied up project directory structure