Organizational changes, runs properly on windows again