Reorganising code base