Changed directory structure and added demo