total directory restructure.  all code non-working.