Moved working commands to another file