moved a lot of stuff to extended modules