clean up and organize jitware project