New package heirarchy.

Also renamed CombinedTrade to FullTrade as that is more descriptive.

Eventual goal is to spin off com.dustyneuron.txmarket into a seperate library.