Add improvement and remove unnecessary files