Reorganize definitions