Make packaging simpler