updated package to be all in one with no subdir