074028f Split out the components into their own files