rearranged FilePage architecture one more time