Revamped config. ELPA no longed committed. More modularity.