refacter: make files structure compact