Renaming the first example
Code restructuring and cleaning up dependencies