fix directory structure, whitespace