Refactored package naming a bit, and added User and Role entities