refactor - mhuckaby : cleaned up context xml files, updated xsd version, moved to next ehcache ver, moved controllers to controller pkg.