Reforming related work
Latest main file
Changes in tools mapping