Consolidated to single ead module namespace, removing index files