Refactored to move based file format handlers into separate package