refactoring in app entyties
Merge pull request #3 from fs/refactoring-app

refactoring in app entyties