CW-68 fixed list by mask
CW-68 fixed list by mask
CW-68 refactored names
CW-68 refactored locations, rearranged maven modules
Merge branch 'feature/cw-68' into develop