Moved solution one level up