add branch and repo_os_version, use new repo directory layout
simplify tarball logic, add non-free to directory layout and build both distros