Rearrange file and package per convention.

WIP - Please review but do not merge.