Reorganized imports
Fixed mistakes

reorganized binders, fixed ComputeServiceAdapter