Resources refactor
Metadata location refactor