better folder structuring and filenaming