Cleaned file architecture.