Refactoring commands structure.
Adding new tests using mkdir_p method.