Made folder stucture more clear.