Move more components into true modules