Tweaked the directory structure.