Did some package organizing