Refactored make-file with subdir