Started cleanup of folder and code, proper error checking scan coming next