rearrange decls