Reorganise: Moved to source
Merge pull request #5 from jackthorley/reorganise

Reorganise: Moved to source