Moved phalcon stuff around