Added modules and initial package update