started fixing package so that it's contents are accessible from other packages