Improve directory structure, add fzpz parts.