moved solutions to one file