Moved stuff around, also start client