Rename Entity to BaseEntry
Move models to library