Separating the spring dependency from core library. WIP