refactored saving, added more saving formats, renamed classes/packages