Refactoring file layout for engine
Adding schemas and moves back
Merge remote-tracking branch 'origin/master'