Made changed for dir paths and CleanUp method.