Refactored asset directories