changed some file names, put functions in own file, new aliases