changes and updates for windows compatability - reordering directories