finished reorganization..for now