* Re-adding left-out files

Signed-off-by: Tristan B. Kildaire <tristankildaire@gmail.com>