Moved files to class level variable