ES6 modules loader updated and general cleaning