Some minor changes, did some package sorting.