Modularized the build files to correspond to the new modular structure. Ensured the default CacheManager is a DefaultCacheManager (not EhCacheManager), pending final outcome on dev list whether or not enable or disable caching expliclity.