Refactor less files to small components