Fix up directory structure