Removed hard coded paths and commands module