Cleanup and organizing imports
Fixed compilation error in e3