Renamed package to adhere to naming convention