Reorganize declarations