Restructured to Add Session Storage
Fixed dependency injection errors in sample site.