major module refactoring. lots of xdata import
rm