refactored to use solution folder