Changed main and command class