Cleaned up.
Removed PreferenceBundles stuff.
Moved files.
Some Correction.
Some Correction.
Much Better Code.