Updated less files and re-ordering the modules and structure