Ok first pass at reshuffle, plenty of name broken as of now i'm sure need to test on ocean only
missing file