Some re-organizations. Removed O3 flag for win32