component files once more restructured