adjusted structure of package and make it useable