change file names, cleanup, add use statement