apps is the new app
Merge remote-tracking branch 'origin/master'
Move stuff around so resolve is easy to read
Fix sub resolver path, but "tried" is still broken
Fix Resolver404's tried