Consolidating module and adding resource concept.