Add explicit return
Refactor: move some classes into org.mastercoin