Tidying code
Renamed packages