General restructuring and editing in preparation for submission

Paper should now be ready for submission.