Now each file is in its own Component