Decoupled base and prefactor code into two separate containers and moved to new container names nomenclature.
