Fixed packages, imports and compilation errors