Organization fixes to file structure and code merges.

Read title.
Merge pull request #13 from Orasi/Brian_Branch

Organization fixes to file structure and code merges.