use the blueprints wherever possible
move blueprints to _blueprints (it is test support)