Improving config, changing structure to enable modules, adding route event