Refactored Directory structure