Re-structure a bit for deployability