Started to separate EEService
Fixed some errors again