#76 refactored file container structure