Changed directory structure and added new demo