Extract server components into new files
Extract client components into new files
Some factoring
Add server and client demo