Initial commit to restructure client-side.