removed elev files, added into the right categories, changed all function names