first pass on context stuff, removed pkg dir