Refactored resources dir