Simplifying project structure/config
Fixes and WIP demo added.