added more resources, refactored Ruta rules, better structured resources