add some useful classes and update file names