Moves the token into a separate namespace

to prevent circular references
Starts to use real pictures for the wall