Reorganized the fishing module