re-organize directory structure, less duplication of files
re-organize directory structure, less duplication of files