fix typo
reorganize code
change name of file