Code review - fixed
Files moved to correct folder. Files fixed.