Updated makefile for windows, but not tested yet.

Improved layout, still working on Linux.