Added abstraction layer to regex groups
Some moving around. Not to much stuff