Rearranged packages and fixed 1 broken unit test.
Fixed line feeds.