Reworked how sub mkfiles are called