MOD: refactor file tree