Fixed broken imports and missing classes...