removed some modules and added others

Signed-off-by: Gregg Coppen <gregg@iaminawe.com>