reorganize structure for construction