Refactor package to remove L4 references.

Refactoring to remove all reference to the FixtureL4 package.