renaming FilePage classes and some code cleanup