Rerun output directory

[snorben]

Mainly fixed the folder structure for opening and saving files, while also cleaning up the code a little bit.