Move around class
Remove database encoder / decoder
Adding new encoder to entities
Fix typo in encoder