Revamp file tree to improve multiple versions