Moved reporting type to Report.
Added Names for getting the filenames.
Added missing Empty classes.
Added STORAGE into Configuration.