java class dir structure cleanup