New project structure, added entities
Merge remote-tracking branch 'origin/master'
New project structure