Moved File handling to own package