corrected package names, removed obsolete files