Deleted some files
Refactored Project
Merge branch 'master' into Bug-With-Enter-Button