Split some files up. Made everything 'pretty'.