Renamed package to fit with MA#1 and contributors