Add versioning to strucs
Remove strlen, cleanup