updated build, decoupled core lib