Code restructurization