Changed many files, MAJOR reorganization