Restructure
Add test file
Silly Skype
Remove unnecessary junk from test