Rename Main Class and revise version