Reorganize some stuff

(Everything)