keep folders
new enb make with tests
Merge branch 'magic-platform' into dev