Update folder structure
Correct indenting and remove copied comment.