Reorganize some stuff