Fix project structure & dependencies import