Moved content out to unique files
Minimized the code loaded by active_support