Restructured folder directory. Slight early modifications to mongo to be consistent