moving more stuff around
fixes
initial work on versioning