Change formatting and fix autoload troubles.