Switching tallymarked specific data type to using libray data type.
Cleaning up Makefile.am
Re-naming directories.