Changed folder structure and naming contention to be more deployment friendly. Removed all the demo references.