Restructuring logs to be applicable to more general usecases, readded File since it was actually necessary