restructure, moving to puppet, will reconfigure and cleanup tonight