Renamed package. Close #21