Changed to one-level resource bundles.