Renamed all org.mauricioszabo to correct path.
Renamed tests to correct places.