Experimentally changed the file tree a bit