Git merge did not go to plan so...
Removed portions of Backward.
Removed DB2, no one used it and it turned into Global/Database
Restored Database.php but renamed to PHPWS_DB
Moved Group_in and Where out of PHPWS_DB into their own files.
Some changes to Icon and Image. Will need testing
Removed core/class/Tag.php
Updated index.php, still have some "Thing code" that needs correction. Next commit after setup tested