Cleanup for use on production systems

Since we need to make a cookbook for it, I just restructured it a bit for automated installation.