Remove old dir
Rename solution