add support for nested entries
remove unused structs from entry.go