Rearranged some Installation code