Organization fixes to file structure and code merges.

Read title.