Added Main class, changed entry point