Do Not Merge

Updates default module paths/directories for next release.