Merge refactored code and fix build

Merged refactored code;
Fixed all build errors;
Mock implementations;
Assets Service added.