Major refactoring of directory structure.