Improvements to Regex and layout

Merge 3 Regex checks into one and improved file layout