Rename main/layout/aux.rs -> main/layout/extra.rs. (Fix #1226)

@metajack ?