Moved Entry.java to other package