* change namespace to include core
* refactor
* refactor
* refactor
* add missing file
* refactor
* refactor
* update YouTube video in demo (previous was removed)