move package deps to Module insertion point
move extra stuff to other packages
some tests for types