Add ES6 + new structure for folders