Change package structure
Merge branch 'master' of github.com:Slaan/SE1