renamed packages, add more to parser