Moving globals to a new file