Added Makefile Token declaration and test module, restructure folder