Refactor repository, add file handler class

Refactor integrations tests to reflect new structure