Fixed issue #1 as proposed by droidinteractive, removed bin-directories