reorganized projects, fixed dependencies