Commit 1.4.0

98 Files Deleted in order to fully complete merge.