added express template support and re-arranged folders a bit