Fixed imports and package declarations