Projectile scaffolding, mild refactoring