feature-MICASERVER-92 - Renamed package and made some clean ups