Organized directory structure.
Modified getConnection functionality