rearranging directories
fixed connection leak