Resources refactor
Metadata location refactor
Merge remote-tracking branch 'origin/refactor/general' into development
Merge branch 'development' of https://github.com/IngeniusSystems/Meerkat into development