Got rid of the lower case class files