Changed folder names, finished challenge 3