Fix Broken Resource Dependency
Cleaned up

Refactored and cleaned up a lot of awful things.
Cleaned up v2

Cleaned up a bunch more awful files