Modularized packages into another file
Modified readme