correct file renamed
cleanup
code reorganized