Reorder file structure to reflect the singe modules of the application. Add ES6 import/export statements.