Fixed some packages and Capitalized class names