update tests and clean all imports
started to split commands to multiple files