Adding connect server and moving files and adding some structure