Remove missing targets for demo project
Changing file structure and renaming