Total Refactor

This breaks BC big time, so further work on the U2 side will be necessary. Better no composer update for now.
maybe run the reorder thing to format methods together?