cleaned up VS solution and folder structure