reorganisation: storage and transfer classes