Change the file infrastructure to allow better organisation.

Signed-off-by: Elliot Millington <elliot.millington1@gmail.com>