Fixed import error caused by moving to separate package