moving some modules around and angst predictions module
clean up imports and more on angst module