Reorganize into a more package like structure.