Combined files to src

All the changes should be in src. sortHand still has some issues. Need
to debug more.