Restructuralization of the code.