Cleaned up the directory structure so it now models something that is more common.