Save into the correct folder.

Still not using the standard interface, but it keeps things tidier. Will fallback to system directory if save directory not defined