File naming conventions, removed unused files.
Merge pull request #23 from nigelgbanks/7.x-filename-conventions

File naming conventions, removed unused files.
 meging conflicts