bug fix; gitmodules was configured for non-existing directories
(and some other minor changes)

Change-Id: Id6894d77dc2426f32494e604316d095173671de5