renaming some files and cleaning up the code for the elastic kernels