Refactored Dir Structure