Fixed up the directory structure a bit.