refactor and clean up less files