merges / platform directories added