added values validation
created separated folders