Final file structure... i hope.

Signed-off-by: Mark Lubberts <m.lubberts@ymail.com>