Add frameworks and change structure