Fixed package declaration and import errors after renaming package