refactored context - moved to context namespace
updated object model
preparing the authorize service