renamed directories
adjusted gitmodules