Refactor folders for client server layouts