Major refactor including moving resources into their plugins