Repackaging of all classes into 'core' and 'tools'