reorganize code, builds now successfull. fix for issue #13.