Code reorgonize