reorganize code
change name of file