Moving stuff around
Fix typo
tweak
Build updates for refactored octave