move components to individual files