More packaging
Module starting fixed a bit