Pass subdir when instantiating
Better way of building the string