Reorganize and update