Packages refactoring
Changed structure of User and Role