Refactor solutions and tests into individual files