restructering of code