CMake: Making changes so that files appear in IDEs properly
Moving tokens.hpp into utils.