Restructuring has been finished. Compiles.