Renamed packages
added versioning