Restructuring and adding info links
Fixing merge conflicts