re-organizing solution's folder structure