Restructured and fixed dependencies.