First commit.  File/folder restructuring to allow for 'drop-in' placement of breakpoint