updates to the structure and remove demo stuff and comments