lots and lots of changes, so much for splitting it up into smaller commits :D
remove now dead files
Merge pull request #55 from cjstewart88/redesign

lots and lots of changes, so much for splitting it up into smaller commits :D