Improve makefiles and start writing new Trie implementation