Update with latest from umd-mith repo - restructuring of repo