Project layout cleanup.