Refactor dirs
Refaotr with default command