Reorganise files a little.

Signed-off-by: Afsheen Ghorashy <arghorashy@gmail.com>