Clean up directory structure a bit.