New methods, re-arrange packages