Made the project a bit more tidy.