Move non-protocol stuff to another folder