major refactoring of directory structure.