Restructure render package