clean-up, one file per component