More refactoring for elwise
Added some new files