Reorganize structure