Refactoring to break package cycle
Add resources package