Fixed imports after renaming package