clean up file structure.

Signed-off-by: drsii <dan.syme@gmail.com>