adjusted package, removed obsolete stuff