Moving component specific items to the end

These should be last since they're used less often.