Reorganized, trying to fix import error