Reorganize package