Initial commit
Organize and clean code
Fix Test Case regex