changed folder names, fixed dependencies