Restructuring for Blueprints and Application Factory