Remove hiccup package, move some stuff around :)