FIX: get correct exec name Make/files + some refac,