Windows compile fixes. Also, slight restructure of build output directories.