Added folder chekking for all the commands 

 	Added folder chekking for all the commands