Moved metoc to common lib
Additional EeINS restructuring