Organization

Also recompiled windows version