Refarctored code in the connection manager class
Changed project structure