Refactor test programs and organize directory tree
Update .gitignore
Work on scoping functions wah