Updated Helpers to work with the new file structure.