Massive rearrange of source tree to be more logical.
More rearranging.