Fix file import
Rewrite one input file in new format
Rework style and streamline file input