Changed Structure, fix bugs
Changed structure, fixed bugs
Fix merge conflicts