refactoring packages
deleting files
Merge branch 'master' into oscar
wdasdas

asd