Make changes as per Nate PR and delete empty files