Builder refactoring and git ignoring some stuff