cleaned up project, added java package