Merge client and server in a single bottle app
Links reorganized