Changed folder structure and added demo project