Added folders to separate out the client and server