Added module packaging