Renaming some files, added tokens&decorators, added tests