Fixed bug in cmake usage on windows.
Better structure.