refactor file structure
refactor EntryView