Tweaked GA functions and changed file order