Fix MBTrading specific package structure

Put the test to similar directory hierarchy as the implementation, and update the package hierarchy to match the directory hierarchy.