Refactored the file tree structures.