Update Construct
Reorganize Construct

Fix Pretty