files renamed to follow convention
not much changed beyond filenames