Refactored ServiceFactory and Core
Fixed Core conflicts