Move NSBContext and Variable to separate files