merging functions in one file
removing old files