Move base files of core submodule to main repo.
Merge core submodule branch 'master' into develop
Move base files of core submodule to main repo in dev branch.