re-arrange solution files