refactored old resources to new ones
Merge pull request #32 from JacobKorn/refactor_resources

refactored old resources to new ones