Making changes to structure to support Mono in addition to Windows.