Migrated/renamed lib files.  Cleaning up code.