Refactoring demo for main site
New build process; Updating demo;