Updated format of files and paths to models