Re-order structure to use Alembic