update tests, package, organize file tree