moved all client side filed into the client folder
minor code style changes