Re-arranged the puppet modules, classifed the nodes and components