removed the base stuff to the core module