path bits moved out into a module, hut added