Finished phase 1 of the Layout machinery reorganization