Refactored files tree