renamed packages, organised classes