refactor classes into associated packages
increment to snapshot version