Renamed and organized packages
Renamed packages to not say "aggroforce"