Added dependencies
Fixed source addition and server creation