Begin to Modularize Resources; long way to go...