directory structure and file name cleanups