Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit ce4300f7d7526be8651442737e69baf9c220cc99.
Revert "Moved Files"

This reverts commit 0e74eb9a8388db548c855a77b2bda554c70ea71e.