Changed Main class name and some packages