move OS-specific .extra stuff to appropriate files