Corrected import errors due to package restructuring