Reworked file tree