Organize the client side stuff more betterer