Put everything in correct folders.
Prototypes are all correct.

Signed-off-by: Callum <callum.terris@gmail.com>