refactor of ebuilds to get better QA