Renaming folder Structure to match solution name