Some rearranging and organizing