Refactored file structure.