reorganize, better version numbers, static generation in earnest