Small changes to folder structure
More small changes.  Removing old reference links.