Refactored some directories
added more code for testing
Created a cleanup shell script to remove tmp files
Merge branch 'Refactoring-Directories'