Properly organise dependencies