Huge refactoring of directory structure.