refactored some package including for atom