Converted cinch into a PHP object, updated code, consolidated files