reset lib names to default
relocated files as necessary
made a lot of changes... probable should committed them individually but now too much has changed. hurray for keeping up with version control...
Merge branch 'simplify'