updated file storage and rest interface to match domain model