Reorganized the project's structure; improved regex handling.