CONN-491 Cleaned up some more directories
Merge pull request #546 from SrinivasaMurthy/CONN-491

CONN-491 Cleaned up some more directories