Delete current code in preparation for new structure.  New structure to be uploaded in the morning after I have coffee. :)