Splitting Core into Separate Module