Restructured the project one more time and updated connections logic