Reorganize structure for release