Minor refactoring to organize platforms in one directory