Major refactoring, removing old depreciated classes
a
Update!