Restructure and move componentsfolder