reorganizing according to GP standard