renaming to more conventient names
reorganized files