Revert "Refactoring commads :) thx amunak!"

This reverts commit 1828889261bbf9a490ff044fc6a2752d327b2f8a.