Alpha 2

Split in groups, added regex filtering