Refactor bin/doctrine. Moar to come !