Master issue 46 modularize features