Remove package and include components