Changing convention naming for package and classes name. @Amadou suggested!