Refactoring to smaller methods

Still getting permission denied when running mvn for some reason.
Not sure why it gives perm-issues, but the git stuff doesn't...