Updated Tree and Module Files

Updated the code tree and module files ahead of release.