Finished inital version of token type structure
Moved to new folder
Worked on scanner