Reorganization

In this step you delete

that are no longer needed.