Main-Class name refactor