Move sail rendering into JunkSail::Sail class
Reorganize a bunch of code