Move all the stuff to proper packages