Separated client and gui
Finished separating GUI