Reorganize files
Further reorganization
Fix __init__.py root bug
Fix bugs pertaining to GLIMPSE setup in tests
Pinpoint S2 bug