Update of function names and removal of superfluous files.