Added catch_typer, and reorganized file tree