Added several resources, tests, and changed structure