Refactor: New Directory structure