rearrange output to separate demo & actual library
Cleanup and use a few themes & templates