Adding hand decode, and simplified dir structure.