Renaming files and updating example implementation to use abstracted versions