Move package to ./thrift/ to be consistent with package name