Merge pull request chrisboulton#23 from Truoris/patch-1

correct line number

Redo directory structure to match current coding style, rename classe…

…s to match directory style, fix up naming conventions