Changed the package names to better reflect what the classes do. Plus
there was a miss spelling