Restructured the codez.