Reorganize construction procedures, splitting them even more