refactor resources
refactor resources
refactor resources
closes #12