Fixed export symbols etc. for subpackage move