move core module to allow us to turn it into a multi-module