organized classes
fixed same command more times bug