Moving files into separate components