Cleanup, add versioning, etc.