Moved entities out to files