Moved MapInterceptor to c.h.map package. Removed unused classes.