FIX: refactor package