Moved some classes. added base of trading