Tidied up the project a bit