Moved file stuff to Components