Merge pull request #1379 from brentashley/develop

Add step to move existing core extensions to new folder