Changed framework directories structure