reorganized files to tidier ordering
fixed type in filename