Changed structure

Changed structure