Reorganise a bit.
Merge pull request #1 from voltagex/cleanup-1

Reorganise a bit.