Refactored file structure (simpler).