#708-TP [CLEANUP] Cleaned up file domain model