Cleaned up the directory structure a bit.