Change the way includes are done (Issue #24)
Modify single.py to handle new include paths (Fixes #24)