Restructured Java packages