moved modules
stuffs working
update version numbers
Merge branch 'dev-rewrite'