Restructurization of code