Fixed new package structure
include database-tools in core