Initial restructure to support both OSGI and War deployments.