Begin re-organising the files

Signed-off-by: Bowe Frankema <bowe@cfcommunity.net>