Fixed a couple of bugs and added folders for client/server easy configuration.