Re-organised file, cleaner layout.
Merge pull request #1 from Kent55/patch-1

Re-organised file, cleaner layout.