Refactored some packages