Move items to their proper packages, add bad method name check