Restructuring and removing submodules

Signed-off-by: Arné Schreuder <arne@consulta.co.za>