Reorganization of files and removal of some code no longer being used.