Complet reorganizing buoys & beacons

Complete reorganising of buoys and beacons