Cleaned up the init file.
Forward-ported extra.account module updates from master.
Moved antenna related stuff to its own module.