Updated example, removed files
Fix conflicts