Added proper error files and cleaned up directories.