Update initial code layout