Renamed base package structure so that we don't have "Merlin" in the
package twice.  That was painful!