(PDB-843) Move the src files into their new places

Signed-off-by: Ken Barber <ken@bob.sh>
Fix some namespaces

Signed-off-by: Ken Barber <ken@bob.sh>