Refactoring for new demo pages
New build process; Updating demo;