Refactoring file setup