Refactor folders resources