Move TestSql out of the default package
Lift out the sql stuff from the core module into its own SQL module