moved resources to package-based directories