140519

Organizing and Refactoring code in resources