Re-struct the resources folder. Add resolution test.