refactored some code and file organization
minor changes on EWrapper macros
code rearranging
working on multithreading...
rollback