Moved to PSR-2, better routing, added a default routing style