Moved things around, started work on lexer