puppet-git: updated file layout to make it more readable.

See the Clean Code book for a rationale of the layout used.