Remove unused folders. Add include to supervisord