Reorganize the tools a little
More work on the dbmigration tool