Restructure and added more content