Updated organization of files

Changed structure to match recommended style for new additions
Fixed comments in sample content and provided expected results.