Changed directory structure to fit the puppet module spec