Moving things, adding more file handling