applying patch organizer-0.1.patch
Misc fixes
Modified makefiles