Fixed broken imports and package paths