Renamed files.
Huge rewrite.
Dist. of huge rewrite.
Merge pull request #1 from oscarpalmer/dev

Huge rewrite from dev branch.