Dev to Master - Please read the Changelog

There are many file/path change. Please read the changelog as it details all of the changes.