Restructuring

re-restructuring using blueprints