Enum's instead of constants
Content classes moved to specific package
Authorization Service fixed
Storage Service fixed