Re-order structure to use alembic