Tidy up directory structure a little bit.