reorganize

move stuff to their rightful place