Removed the constants from the files, out to a constants file. Refactored code to be able to persist data