Move the heap and typemap modules inside General