DAR-1171, small refactoring of file paths and props order