java packages structure cleanup