Initial commit
Fix regex (capture only things that start with prefixes)
Reorg/Refactor