Re-organize code, adding feature "switched states", cleanup jQuery fn namespace