Changed structure

Minor changes