Remove the extra directory using the puppet way
Clean up the module and add the start of testing stuff.