Rename package and remove class Test