Chemical storage classification: Could you please advise as to which classification chemicals should be stored in chemical storerooms, either DG classification or GHS classification?

Chemical storage classification: Could you please advise as to which classification chemicals should be stored in chemical storerooms, either DG classification or GHS classification?
Chemical storage and labelling: We are sorting through our toxic chemicals ADG class 6 and are not sure how we should now label and store them according to the GHS.