Breaking up packages into different files