Re-organises various files after discussion with Todd.