Cleaned up references to useless packages
Renamed the whole project, clean up packages