Tidy up the directory structure a bit more