Better directory and path handling

- Zipped files no longer hold the full path