[fix/update] major directory restructure for git