Moved some modules from inc to src.
Added trie to reader.