File structure change for command line use