Refactored natural resource block folder structure